Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

qt6: Handle deprecated QLocale::nativeCountryName #838

Merged
merged 1 commit into from
Oct 3, 2024

Conversation

hebasto
Copy link
Member

@hebasto hebasto commented Sep 29, 2024

Split from bitcoin/bitcoin#30997.

QLocale::nativeCountryName() has been deprecated since Qt 6.6.

QLocale::nativeTerritoryName() was introduced in Qt 6.2.

This PR ensures compatibility across all supported Qt versions.

No behaviour change for the current codebase, which uses Qt 5.


This PR can be tested on macOS using the first commit from bitcoin/bitcoin#30997 and Homebrew's qt package.

This change ensures compatibility across all supported Qt versions.
@hebasto hebasto added the Qt 6 Transition to Qt 6 label Sep 29, 2024
@DrahtBot
Copy link
Contributor

DrahtBot commented Sep 29, 2024

The following sections might be updated with supplementary metadata relevant to reviewers and maintainers.

Reviews

See the guideline for information on the review process.

Type Reviewers
ACK promag, jarolrod

If your review is incorrectly listed, please react with 👎 to this comment and the bot will ignore it on the next update.

@hebasto
Copy link
Member Author

hebasto commented Oct 2, 2024

Friendly ping @Sjors @furszy @achow101 @jarolrod ;)

Copy link
Contributor

@promag promag left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Code review ACK 9123a28.

Copy link
Member

@jarolrod jarolrod left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK 9123a28

Built this on macOS with qt5.15 and Qt6.7, as well as on Linux Ubuntu with Qt6.4 and Qt6.7, and tested GUI functions related to translations.

@hebasto hebasto merged commit f117f3f into bitcoin-core:master Oct 3, 2024
16 checks passed
@hebasto hebasto deleted the 240929-qt6-locale branch October 3, 2024 19:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Qt 6 Transition to Qt 6
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants